Call gettext_initialization before checking gtk_initialized, otherwise

2005-07-18  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
	gettext_initialization before checking gtk_initialized, otherwise
	there are scenarios where it is not called at all. For an
	example, see tests/testfilechooserbutton.c.  (#310323,
	Arkady L. Shane)

diff --git a/ChangeLog b/ChangeLog
index a4d916a9015a2587d0a54e4b2482c315c38052a9..30fb2f9779654f4bf187237e450fb88aea24e8d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
+       gettext_initialization before checking gtk_initialized, otherwise
+       there are scenarios where it is not called at all. For an
+       example, see tests/testfilechooserbutton.c.  (#310323, 
+       Arkady L. Shane)
+
 2005-07-18  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a4d916a9015a2587d0a54e4b2482c315c38052a9..30fb2f9779654f4bf187237e450fb88aea24e8d4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
+       gettext_initialization before checking gtk_initialized, otherwise
+       there are scenarios where it is not called at all. For an
+       example, see tests/testfilechooserbutton.c.  (#310323, 
+       Arkady L. Shane)
+
 2005-07-18  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a4d916a9015a2587d0a54e4b2482c315c38052a9..30fb2f9779654f4bf187237e450fb88aea24e8d4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2005-07-18  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkmain.c (gtk_parse_args, gtk_init_with_args): Call
+       gettext_initialization before checking gtk_initialized, otherwise
+       there are scenarios where it is not called at all. For an
+       example, see tests/testfilechooserbutton.c.  (#310323, 
+       Arkady L. Shane)
+
 2005-07-18  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkgc-win32.c (gdk_win32_hdc_get): Be sure to remove

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index bd42c7ea410f9f3a31b7c55c3d07fca3fc8789bf..49817a9050676949676f58bdcff5e0e088f653fe 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -616,14 +616,14 @@ gtk_init_with_args (int            *argc,
   GOptionGroup *gtk_group;
   gboolean retval;
 
+  gettext_initialization ();
+
   if (gtk_initialized)
     return TRUE;
 
   if (!check_setugid ())
     return FALSE;
 
-  gettext_initialization ();
-
   gtk_group = gtk_get_option_group (TRUE);
   
   context = g_option_context_new (parameter_string);
@@ -663,14 +663,14 @@ gtk_parse_args (int    *argc,
   GOptionContext *option_context;
   GOptionGroup *gtk_group;
   
+  gettext_initialization ();
+
   if (gtk_initialized)
     return TRUE;
 
   if (!check_setugid ())
     return FALSE;
 
-  gettext_initialization ();
-
   option_context = g_option_context_new (NULL);
   g_option_context_set_ignore_unknown_options (option_context, TRUE);
   g_option_context_set_help_enabled (option_context, FALSE);